From 0dc28066e9f0339ad8f4aea233cc5912139c5f79 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Thu, 1 Apr 2021 16:42:54 +0200 Subject: [PATCH] x86/vioapic: issue EOI to dpci when switching pin to edge trigger mode MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When an IO-APIC pin is switched from level to edge trigger mode the IRR bit is cleared, so it can be used as a way to EOI an interrupt at the IO-APIC level. Such EOI however does not get forwarded to the dpci code like it's done for the local APIC initiated EOI. This change adds the code in order to notify dpci of such EOI, so that dpci and the interrupt controller are in sync. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vioapic.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index e3ee747b7d..87370dd417 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -219,6 +219,7 @@ static void vioapic_write_redirent( struct domain *d = vioapic_domain(vioapic); struct hvm_irq *hvm_irq = hvm_domain_irq(d); union vioapic_redir_entry *pent, ent; + bool prev_level; int unmasked = 0; unsigned int gsi; @@ -234,6 +235,7 @@ static void vioapic_write_redirent( pent = &vioapic->redirtbl[idx]; ent = *pent; + prev_level = ent.fields.trig_mode == VIOAPIC_LEVEL_TRIG; if ( top_word ) { @@ -270,6 +272,21 @@ static void vioapic_write_redirent( spin_unlock(&d->arch.hvm.irq_lock); + if ( ent.fields.trig_mode == VIOAPIC_EDGE_TRIG && + ent.fields.remote_irr && is_iommu_enabled(d) ) + { + /* + * Since IRR has been cleared and further interrupts can be + * injected also attempt to deassert any virtual line of passed + * through devices using this pin. Switching a pin from level to + * edge trigger mode can be used as a way to EOI an interrupt at + * the IO-APIC level. + */ + ASSERT(prev_level); + ASSERT(!top_word); + hvm_dpci_eoi(d, gsi); + } + if ( is_hardware_domain(d) && unmasked ) { /* -- 2.30.2